From: Miles Bader <miles@gnu.org>
Date: Wed, 31 Mar 2004 23:46:42 +0000 (+0000)
Subject: Resolve CVS conflicts
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~23409
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ab1b44f8c1f73699904cd326081a168a0e45ab23;p=emacs.git

Resolve CVS conflicts
---

diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index bdd4dd030d3..4e9fc24ade1 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -668,6 +668,5 @@ See documentation for variable `ebnf-ebx-lex'."
 
 (provide 'ebnf-ebx)
 
-
-;;; arch-tag:
+;;; arch-tag: bfe2f95b-66bc-4dc6-8b7e-b7831e68f5fb
 ;;; ebnf-ebx.el ends here